use 'grep -o' to extract _get_type functions from header files. this

2007-12-03 15:18:17  Tim Janik  <timj@imendio.com>

        * gtk/Makefile.am (gtktypefuncs.c): use 'grep -o' to extract _get_type
        functions from header files. this should be portable across linux and
        Mac OS, unlike the previpous sed expression.

svn path=/trunk/; revision=19098

diff --git a/ChangeLog b/ChangeLog
index ecce26a0bf6b3166942d90d11478e75b1784f422..51782e2a7341f80601a4b043150657a84f5c3d59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-03 15:18:17  Tim Janik  <timj@imendio.com>
+
+       * gtk/Makefile.am (gtktypefuncs.c): use 'grep -o' to extract _get_type
+       functions from header files. this should be portable across linux and
+       Mac OS, unlike the previpous sed expression.
+
 2007-12-1  Cody Russell  <bratsche@gnome.org>
 
        * gtk/gtkpaned.c: (gtk_paned_set_position) [Win32]:
@@ -13,7 +19,7 @@
        * gtk/gtkrc.c: Fix doc typos.  (#500672, David Lambert)
 
 2007-11-29  Matthias Clasen  <mclasen@redhat.com>
-       
+
        * gtk/gtkmenuitem.c (gtk_menu_item_paint): Remove leftover
        debug spew.
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e960a07fba316dc5cc7122322b61d8e8dc443658..7e1395365d3f27686ac1a6eab49cffc72d526a0c 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -815,8 +815,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 gtktypefuncs.c: @REBUILD@ $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
        echo '#include <gtk/gtk.h>' > xgen-gtfsrc.c && \
          ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-         egrep '\<g[td]k_[a-zA-Z0-9_]+_get_type\>' | \
-         sed -e 's/.*\(\<g[td]k_[a-zA-Z0-9_]\+_get_type\>\).*/\1/' | \
+         grep -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
          sed '{ s/^/vgt=/; s/$$/();/; }' > xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf